Update all internal users of gtk_dialog_get_action_area

Some of these should be revisited and fixed. For now,
just avoid the deprecation warnings.

diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index b25974df47b5f855c64bf88718e2e0fd13463071..c916d47e02143241595860d469f9f420d481b7f9 100644 (file)
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -435,7 +435,9 @@ ensure_software_button (GtkAppChooserDialog *self)
     {
       GtkWidget *action_area;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       action_area = gtk_dialog_get_action_area (GTK_DIALOG (self));
+G_GNUC_END_IGNORE_DEPRECATIONS
       self->priv->software_button = gtk_button_new_with_mnemonic (_("Software"));
       gtk_button_set_always_show_image (GTK_BUTTON (self->priv->software_button), TRUE);
       gtk_button_set_image (GTK_BUTTON (self->priv->software_button), gtk_image_new_from_icon_name ("gnome-software", GTK_ICON_SIZE_BUTTON));

diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 6898f6f986df4873f7e899ddc2f9a32fdecae344..09fb139dad2e04fd3485323e01648f01683ff906 100644 (file)
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -1015,7 +1015,9 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
   GtkStyleContext *context;
 
   content_area = gtk_dialog_get_content_area (cpu_dialog);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (cpu_dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
   gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */

diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index f1169f7539107ea7b8e82bb67f2f96089b0537ee..73c32f602adf4e888d83a86d54a192a47cbed7cc 100644 (file)
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -291,7 +291,9 @@ file_chooser_widget_file_activated (GtkFileChooser       *chooser,
   /* There probably isn't a default widget, so make things easier for the
    * programmer by looking for a reasonable button on our own.
    */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (fc_dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
   children = gtk_container_get_children (GTK_CONTAINER (action_area));
 
   for (l = children; l; l = l->next)
@@ -393,7 +395,9 @@ file_chooser_widget_response_requested (GtkWidget            *widget,
   /* There probably isn't a default widget, so make things easier for the
    * programmer by looking for a reasonable button on our own.
    */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (fc_dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
   children = gtk_container_get_children (GTK_CONTAINER (action_area));
 
   for (l = children; l; l = l->next)
@@ -466,7 +470,9 @@ ensure_default_response (GtkFileChooserDialog *dialog)
 {
   GtkWidget *action_area;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+G_GNUC_END_IGNORE_DEPRECATIONS
   gtk_container_foreach (GTK_CONTAINER (action_area),
                         foreach_ensure_default_response_cb,
                         dialog);

diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 65f994c7ebb8532bfaf93adf8544f695458921d3..87c7479e3e71af2e6dd0ba22fa75acb7286ce915 100644 (file)
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -513,7 +513,9 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
   priv->dialog = dialog;
 
   content_area = gtk_dialog_get_content_area (dialog);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   /* Set the dialog up with HIG properties */
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);

diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index 97309651efbf281d571ba3f9978dddb27a1bf06b..da9bb1b174f2ddbefc661276df1212d39cfe00ac 100644 (file)
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -129,7 +129,9 @@ gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog)
   dialog->priv = priv;
 
   content_area = gtk_dialog_get_content_area (rc_dialog);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (rc_dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   gtk_container_set_border_width (GTK_CONTAINER (rc_dialog), 5);
   gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
@@ -155,7 +157,9 @@ gtk_recent_chooser_item_activated_cb (GtkRecentChooser *chooser,
   if (gtk_window_activate_default (GTK_WINDOW (dialog)))
     return;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (rc_dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
   children = gtk_container_get_children (GTK_CONTAINER (action_area));
   
   for (l = children; l; l = l->next)

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 86c5e56c151d15429fc7b6b28e121c5a41630987..f0f1a1403ac9b5d8cc7c1b95ed1610ab6dad33ed 100644 (file)
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -1041,7 +1041,9 @@ test_children (void)
   g_assert (strcmp (gtk_buildable_get_name (GTK_BUILDABLE (content_area)), "dialog1-vbox") == 0);
 
   action_area = gtk_builder_get_object (builder, "dialog1-action_area");
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   dialog_action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+G_GNUC_END_IGNORE_DEPRECATIONS
   g_assert (action_area != NULL);
   g_assert (GTK_IS_BUTTON_BOX (action_area));
   g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (action_area)) == GTK_ORIENTATION_HORIZONTAL);

diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c
index e66c835cb5fe759ddd30b5307933d67c7b5ece92..c53fc61574e58f2e8f10d37f2f774f0c9727aaae 100644 (file)
--- a/testsuite/gtk/templates.c
+++ b/testsuite/gtk/templates.c
@@ -37,7 +37,9 @@ test_dialog_basic (void)
 
   dialog = gtk_dialog_new();
   g_assert (GTK_IS_DIALOG (dialog));
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   g_assert (gtk_dialog_get_action_area (GTK_DIALOG (dialog)) != NULL);
+G_GNUC_END_IGNORE_DEPRECATIONS
   g_assert (gtk_dialog_get_content_area (GTK_DIALOG (dialog)) != NULL);
 
   gtk_widget_destroy (dialog);